tree bcc854cbacc169e77cbcdb2ed8caa96201fadda8
parent 12a2c9e41df573166e182d5e97067bfcb535558e
parent 087265575a950d0bb26789abe98350bb7e8c0039
author The Android Open Source Project <initial-contribution@android.com> 1342712473 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1342712473 -0700

Reconcile with jb-mr0-release

Change-Id: I8eadf20cd941fbf298677537d3771780eca0b07b