| commit | 6062eb0756cb94cd164223f5961091b78fcc43d4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:22:50 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:22:50 2012 -0700 |
| tree | abb3a4bf9214fc94115d65f4f7777f88b51fc843 | |
| parent | 2c72e9faa5ad5e324b85b78e383dd85c8bdc04a9 [diff] | |
| parent | cc8fedd302110af6bd1cc3aa8268639ca64a9c46 [diff] |
am cc8fedd3: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'cc8fedd302110af6bd1cc3aa8268639ca64a9c46':