tree e75997ea124b2ed0c910a2f61957a5960a89864b
parent 2484c1b0ea2e118ab06c1a36f779e6e8a8ec7035
parent e79df169818e0db283e7be4c06a950523391a82e
author Walter Jang <wjang@google.com> 1476914238 +0000
committer android-build-merger <android-build-merger@google.com> 1476914238 +0000

Fix build break do to  upstream Flags change
am: e79df16981

Change-Id: If8103b4f28043d6c233e727cc2917789fc9110aa