| commit | c89354b9af6adea83ed254912e61e511366a08d9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 10 19:41:37 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 10 19:41:37 2013 -0700 |
| tree | 897cd04a91e3aaf0cc9c5be2b70d2bd2456e9afc | |
| parent | d01118aeba78ec711dfcc13259c9d01ace7112fa [diff] | |
| parent | fb899d85ee3497dbb9443fbbee0241aaf94f2e52 [diff] |
am fb899d85: am 3019a5e1: am a8d29082: (-s ours) am d5c8247f: Reconcile with jb-mr2-release - do not merge * commit 'fb899d85ee3497dbb9443fbbee0241aaf94f2e52':