| commit | 7177a6aeac8eff88bf41824dd794c48c1522b716 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:23:31 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 06 13:23:31 2012 -0700 |
| tree | a352c67d0eacc19da2c51d35a6882835de418507 | |
| parent | ce818f883a094483f823cffd45106e1603ac5805 [diff] | |
| parent | 68cdf704ba1fa342eda8b76de58f8107bff78ba3 [diff] |
am 68cdf704: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '68cdf704ba1fa342eda8b76de58f8107bff78ba3':