tree 6d39c3c999c0e556786847caf3d0f3971af04f63
parent f6a11fd92d1a3c3d214f44127488c5ff09201137
parent 4d1264b083c537005efe2333e070c31ed51d5e0f
author Xin Li <delphij@google.com> 1487092424 +0000
committer android-build-merger <android-build-merger@google.com> 1487092424 +0000

Merge commit '055aee28cedc3' into klp-dev: am: 2051465f2e am: d7cab14288 am: cafd00b375 am: 4cea75b987 am: fb5baf6521 am: fa744d0a95 am: f77113a2f7 am: c10d8e4d3b am: e314d1ffe2 am: 75a1d7329b am: 9037e1d2ba am: 838ce87483 am: fead4c9960 am: a2b598aaa1
am: 4d1264b083

Change-Id: I4eb2c8470c792cad60917f25ee067cf44d8af854