tree 6bff5daf9bb2b4ec3104944ebd9877c1150c885a
parent e57edfe59cc9f9b3ff4d7b9b1b1097d8027f7a55
parent 57983350058aedbca1a66c51ae8440faea32310c
author Bill Yi <byi@google.com> 1446593552 +0000
committer android-build-merger <android-build-merger@google.com> 1446593552 +0000

Merge commit \'1edd8b6105c0ed292fc33e15d1f5cdd2a81ed154\' into HEAD
am: 5798335005

* commit '57983350058aedbca1a66c51ae8440faea32310c':