commit | afac6c903d01fe2564b52b08287f44e2d5b3f04e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 11:54:49 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 11:54:49 2012 -0800 |
tree | 7d14e305293dd41462c93c0d8a3938c6e6098544 | |
parent | b3748f317af6f19447763489800576c23a244544 [diff] | |
parent | fd74ba5175d01027485d099901b83153aa7afa3c [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ib6d98680f4ca7dacc33209363896f2cdff2127ed