tree b88c6115147083b544f1493f5ae04c7fbf314ab1
parent 7c488c1b4e989f742f0525603c41bef9673aa239
parent 522ccfee04cbd95f021acf674e4488428de925b4
author The Android Open Source Project <initial-contribution@android.com> 1345675007 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1345675007 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I1bfc1867c44e5793876b1bd237b134cc8357e25a