commit | 6d181dc06a7746f47e6ff15e5e65212e0491d7d7 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Sat Aug 08 17:06:55 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 17:06:55 2015 +0000 |
tree | cbbb0a08ef0539d8cef3ebeba4020a2e31fc1a67 | |
parent | 4b70b572c48fa025860f66c76e85c9ce84143507 [diff] | |
parent | 63c3068ac343cec183bff4afd5fd05dbbf3ccede [diff] |
am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) * commit '63c3068ac343cec183bff4afd5fd05dbbf3ccede': Bump revision number for all system images