tree ace1439cb2d6520c45ad4db9b71b6c78ae398b22
parent 89c1e128803ad1e3264d061e762a4eaf8a7d06c6
parent b1441860aa50232bdb9a40f28b6dd108ab787661
author Chisato Kenmochi <Chisato.Kenmochi@sony.com> 1487787520 +0000
committer android-build-merger <android-build-merger@google.com> 1487787520 +0000

Updated to suppress some warnings. am: f1540a7a01 am: 4f80eeb6e6
am: b1441860aa

Change-Id: I1ec19eaaf6862807a52c8d1b1c9776b9814079e1