| commit | 78704aac8d52ec8bdc48451e987dae1eafb141d0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:18:28 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 05 08:18:28 2012 -0700 |
| tree | 143838b633538bf69ebdf78f63a41dec24698886 | |
| parent | b6a91d011589828fdc81dfebbe7e544bd4ddb18c [diff] | |
| parent | 0490cd475d77f22afc059f24c28dc2abb7290973 [diff] |
am 0490cd47: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '0490cd475d77f22afc059f24c28dc2abb7290973':
