| commit | 0ee5858203a93d39db3e929a9c5cbe77f92c8412 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 11:56:32 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 11:56:32 2012 -0800 |
| tree | b154e9256c46b99193f23b4871195dae0b4929ce | |
| parent | 9cdd3ca577ca2636178711387a88b779ba82dcd3 [diff] | |
| parent | afac6c903d01fe2564b52b08287f44e2d5b3f04e [diff] |
am afac6c90: Reconcile with jb-mr1-release - do not merge * commit 'afac6c903d01fe2564b52b08287f44e2d5b3f04e': JOP40E