commit | 447e392b6036aa9fcb9427782ab249921def8fc2 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:26:39 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:26:39 2012 -0700 |
tree | 7f1f9ad0a92c7cf2c9f2fa2f9a2a797fc8861786 | |
parent | 91368bb1c352dd00b8751b92cb1d6971e0143505 [diff] | |
parent | 3f7873358fe7e85a8135f2d844b406da4070ba18 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: If02ab00e12b60a3852ec58a1f7eba47e2675da1a