| commit | 4f395af9b21acc2220a51c55c20dbdd7d995ea1f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 12:49:03 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 12:49:03 2012 -0700 |
| tree | 1eed823ec3db2ce956719688eed7377fe903e95c | |
| parent | 883462790b7696f85f792aa1863ea8998ec94424 [diff] | |
| parent | 3e78f477c237e3ac9da58b698893b482c4baefa4 [diff] |
am 3e78f477: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '3e78f477c237e3ac9da58b698893b482c4baefa4':