Merge commit \'4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582\' into HEAD

am: af05ad919a

* commit 'af05ad919aca901bbadabad5988ad77e8426e1e2':
This commit is contained in:
Bill Yi 2015-11-03 23:31:35 +00:00 committed by android-build-merger
commit a87d67d311

Diff Content Not Available