tree 47b2347de9f1af554561259220fe2e1a8e7822c7
parent c789be850ca14b945e72412457991d7a5e13126e
parent af05ad919aca901bbadabad5988ad77e8426e1e2
author Bill Yi <byi@google.com> 1446593495 +0000
committer android-build-merger <android-build-merger@google.com> 1446593495 +0000

Merge commit \'4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582\' into HEAD
am: af05ad919a

* commit 'af05ad919aca901bbadabad5988ad77e8426e1e2':