tree b6e50972eba1887977fdcfa0a665469e9a359df9
parent 82dea6f6b8b48a9a1b7171ecd6848602ec7211e2
parent f2a8aa34eb137780e9fb0e7335355ec50db2cae6
author Nick Kralevich <nnk@google.com> 1439054859 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439054859 +0000

am f2a8aa34: am fdcade18: am ff246059: 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 'f2a8aa34eb137780e9fb0e7335355ec50db2cae6':