commit | d9db09d723538253169d4e297ff4fa974d16809e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 01 07:52:10 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 01 07:52:10 2012 -0700 |
tree | 9d33d0b60b7559b2bf3c46820b5e063683c73665 | |
parent | 413f693c90c0f7191c27c70b192ca92a68aa77c7 [diff] | |
parent | c55d7ac337641c7ad9ff734169e65553fbb40787 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ieb5a478a87c7f3a3bb38e588c92e6768c047bb29