tree 093ca468b973a3281fcc7b3d5ce924c8ab04586c
parent 2c53526b4b2d89d453ecf89548ed94427424d1ec
parent 84f479f6b558ec4ce6d62d00b801e4ac76bdc657
author fionaxu <fionaxu@google.com> 1465351452 +0000
committer android-build-merger <android-build-merger@google.com> 1465351452 +0000

DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c
am: 84f479f6b5  -s ours

Change-Id: Ia2605d430a9f3fdc1de6a59bb5702f4f65ae3816