| commit | fd3e06e52e88b003c532d5f7990acc21aa69612c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 15:52:03 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:52:03 2012 -0800 |
| tree | 91790c221bcdd8cd11c10369e4d463f587b498c3 | |
| parent | f8024598a524da4821d3c2e9a92547c60f96cf10 [diff] | |
| parent | 4f936ecf373610d1fd8c506586c057d1f1ea1e3f [diff] |
am 3a47ffb4: (-s ours) am 6297b872: Reconcile with jb-mr1-release - do not merge * commit '3a47ffb453fbb496024d9a311a681b7333dd7004':
