tree 959c952c01b60e32e5f39855085f2dfa084a9033
parent 64ce9511888de9f42efe5561068d02eaf7c7df9b
parent 9cf962bbfafafc74d6501902b63bce4b191dc45f
author The Android Open Source Project <initial-contribution@android.com> 1347460889 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1347460889 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I4699c3ff7316df6659977ec08e7f386f98202c43