tree 55fb4897659d12eda3b75ccd36e39c5c6c56f571
parent bef6a5c1350878f4842fcfdc918e67377c7df2aa
parent ee4e15c4e5487be79f6c9a97366046b4a8e5e67a
author Daniel Xie <dxie@google.com> 1449798947 -0800
committer android-build-merger <android-build-merger@google.com> 1449798947 -0800

Merge "Cherrypick the following CLs from LMP MR1" into lollipop-cts-dev am: 4528128713  -s ours am: 7fc6f38cb1 am: a5d8f5eb9e am: 1c656a46e0 am: fa2dc48cdf am: 65262026c2
am: ee4e15c4e5

* commit 'ee4e15c4e5487be79f6c9a97366046b4a8e5e67a':
  Cherrypick the following CLs from LMP MR1