tree e98153acc563ea86bf41c619d2d6fc784705757a
parent 92995d2d6063427402dd4c76b78140c731ea698d
parent f6a11fd92d1a3c3d214f44127488c5ff09201137
author Xin Li <delphij@google.com> 1487093316 +0000
committer android-build-merger <android-build-merger@google.com> 1487093316 +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: e23ce0f5ac
am: f6a11fd92d

Change-Id: Id5327cdbc9023a93ac9aeb5764970e12b62a7521