| commit | 103af7c17d42165705d7efc396e4e65a4a1f9d75 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 14 16:48:45 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 14 16:48:45 2012 -0800 |
| tree | 6d9bc6644bf77ef706ef34633c532e1c4bfa08b1 | |
| parent | 494524a7c9ca20b646e4929ff0324a6a4c4057ba [diff] | |
| parent | a8af928f4e7dc3e0cd00bdaa0c168ac53fcd9bc0 [diff] |
am a8af928f: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'a8af928f4e7dc3e0cd00bdaa0c168ac53fcd9bc0':