commit | ff246059fcf6d2071558ba490d30256e1e56e153 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Sat Aug 08 17:06:57 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 17:06:57 2015 +0000 |
tree | cbbb0a08ef0539d8cef3ebeba4020a2e31fc1a67 | |
parent | fe281e20be84db5cdca9c26713d57bca42c27f88 [diff] | |
parent | 5fc6ca1190052933938b6cf70d1f3f696e0db7a5 [diff] |
am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) * commit '5fc6ca1190052933938b6cf70d1f3f696e0db7a5':