| commit | 4d2dd5577a7f1c5d485b66a95599c230952c191f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 29 08:10:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 29 08:10:31 2013 -0700 |
| tree | 70b0ea93507a38f5b761f07bb357a7c19eb2e3a4 | |
| parent | 8bae43ae86b9942892980c3c01bff5c812b1db7f [diff] | |
| parent | 197d3e077384087a8674bbfcbecf63a88e611426 [diff] |
am 197d3e07: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '197d3e077384087a8674bbfcbecf63a88e611426':