tree aa8db5a71d528f9f90719844cafc90b01483bdae
parent c6b7ecd791e61fc93a36ef56a70576ce0836b5a2
parent d2bd9bafd91577990249a906611fae8820fce247
author Nick Kralevich <nnk@google.com> 1439051029 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439051029 +0000

am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)

* commit 'd2bd9bafd91577990249a906611fae8820fce247':