tree 0fe003ba0d24a69430cffa048f11766abc81bc61
parent 1688da2a913dbb90ecfee379c4f67942c7fa1c12
parent 94556cea3446e2815d3415755176426e57330510
author Daniel Xie <dxie@google.com> 1442955265 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442955265 +0000

am 94556cea: am bf6cf0f7: am 80d7e4ab: am 5bd93aed: (-s ours) am 25c13314: am eff5baa6: DO NOT MERGE: resolved conflicts for 85a6998e to lmp-mr1-dev

* commit '94556cea3446e2815d3415755176426e57330510':