| commit | 945d7894989091d3d149d9468f1b0546ac58c73a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:42:59 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:42:59 2012 -0700 |
| tree | ca3bf242839c0c6a90ae0403b905457cbae31f5b | |
| parent | 1270748b1c5d166a58b9ac0e8fa281bd404f6abf [diff] | |
| parent | f839edf9eb99b5f003e24691593c4392ad9bc153 [diff] |
am f839edf9: (-s ours) Reconcile with jb-mr1-factory-release - do not merge * commit 'f839edf9eb99b5f003e24691593c4392ad9bc153':