commit | 23fcf955f2cb3bab68b51d82e9ebe21864b6a71d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Feb 21 15:17:26 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 21 15:17:26 2012 -0800 |
tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 | |
parent | a0d46774e467f2371ae74221c5a599d921d1fec0 [diff] | |
parent | 85e18a7f10fcde1e378933cdc6526b9c8bb1f725 [diff] |
am 6815d49c: Reconcile with ics-mr1-release * commit '6815d49cfa1ee74ffc8e9640e42d0fd1a7592286':