| commit | 03db8767d501cbde210f0999b60577546c232f8b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 29 08:10:32 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 29 08:10:32 2013 -0700 |
| tree | 14c292ad650b3835ffb1ed2b60ca1a6cdb67e4f7 | |
| parent | f0014a6b259a10c9a79054ec3613ad510c23b3cb [diff] | |
| parent | 087328986922a36bef6f1829790e0840516405a4 [diff] |
am 08732898: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '087328986922a36bef6f1829790e0840516405a4':