commit | ca4117ca387fbcd8a9e18070e0a73c2eae4baa22 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 14:48:19 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 14:48:19 2012 -0700 |
tree | 82b1b601d482ae6f3459bfdd3f189bbdf208c890 | |
parent | 194da0b8b368ac61b23870224bc0d449ad465bd4 [diff] | |
parent | 4594d8baf85080e9a5b3ae25ad809d6d924e6e88 [diff] |
Reconcile with jb-mr0-release - do not merge Change-Id: Ica8b95c440b5c3fe0a7d31e9633d4ac1b0e02c38