| commit | e569bf103ce04b53fcba01525404f1ecb78c3543 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:35:45 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 07:35:45 2012 -0700 |
| tree | 69021992fd6b7ccc4cf8e7d6286bdb2c74d19f13 | |
| parent | 806eba452423e5e5971ef096dfae3fed180db665 [diff] | |
| parent | b031214a91b428eb6fc7311a3b090ca99ed5237d [diff] |
am b031214a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b031214a91b428eb6fc7311a3b090ca99ed5237d':