| commit | 3d1b492606ffe30bd28f869546d88c4f19c933ed | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:30:00 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:30:00 2012 -0800 |
| tree | 01610dec479020fa54355b283d31f8c58b1c59f3 | |
| parent | 0e007f9c6c3282598b0be56ab48237415321d4b6 [diff] | |
| parent | 812eb3c5cba3d5aca3c755c51e3a81e91f6b94c4 [diff] |
am 812eb3c5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '812eb3c5cba3d5aca3c755c51e3a81e91f6b94c4':