| commit | d8e7812e622d7a39a19762a464a66090abadbe7c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 28 09:49:29 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 28 09:49:29 2012 -0800 |
| tree | 949deb9a50bab5bc45e16e2fde02d98ca3206118 | |
| parent | 3d17ae5953b974befa38af2fdd9853cd62f67b7c [diff] | |
| parent | e9803c53b85d162308c17b2f1ec90316c155315e [diff] |
am e9803c53: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'e9803c53b85d162308c17b2f1ec90316c155315e':