| commit | 1ea2e463a3edef81ff2a4d166eadd826dc0b3bdd | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 17:14:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 17:14:51 2015 +0000 |
| tree | 81f6f1b076d932a74578012f45e525c517c823b0 | |
| parent | 20f4cf0b0f83a300f4267b56481d5f88d54ac8de [diff] | |
| parent | 6d181dc06a7746f47e6ff15e5e65212e0491d7d7 [diff] |
am 6d181dc0: 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 '6d181dc06a7746f47e6ff15e5e65212e0491d7d7': Bump revision number for all system images