tree 759267e1a8295ea9e0524a4dad23427e825f2feb
parent af728ba1c48f28a400b3c04e11769d92896380b5
parent 066c9208073ee6cc8fac58b8cb16fa40dd329998
author Qiwen Zhao <zhao@google.com> 1443728215 +0000
committer android-build-merger <android-build-merger@google.com> 1443728215 +0000

Merge commit \'e7e87a1440\' into mnc-dr-dev-plus-aosp
am: 066c920807

* commit '066c9208073ee6cc8fac58b8cb16fa40dd329998':