tree 2944136293e0ed1a47e2e8eeaf57c016642c6c4d
parent 4dd531f02d688d1ac7c046c52f2ab9450678b87d
parent 7f4f455886999d94a8c36368c5cace5ae194e91d
parent 597c43397d0d38ecb26194f77c830935c8bc365b
author The Android Open Source Project <initial-contribution@android.com> 1343425829 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1343425829 -0700

Reconcile with jb-mr0-release jb-release

Change-Id: If3342704edc69195c0ffc4648f3720990bc9bb3a