commit | d1844d4b30a0f75ed0c30c923bea7c718ba53034 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:56:36 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:56:36 2012 -0700 |
tree | a95a1b9d1a22250784d6f1df5c712c802984d0aa | |
parent | 0620122763502e4ec6f9939c009faaf5a890ad08 [diff] | |
parent | 7cc2dec82e6b85c4a81cffab236f984dd26d35e2 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I8ceb7a33ab427c2d3e884e8b71064ecbc531fd1e