tree c47dabc0ec2ec6a0a25089531bb17a0c04d4e829
parent c10e4fae05b84b4564496be9e3261ceb3b784da5
parent dc9a7c7b23e9cc4468770e0a4a30d87cd6953e01
author fionaxu <fionaxu@google.com> 1465410802 +0000
committer android-build-merger <android-build-merger@google.com> 1465410802 +0000

DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5  -s ours am: e1ca4cd074  -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950  -s ours am: 2d03c0f956
am: dc9a7c7b23

Change-Id: I0cccd4ba128987959aa0e9324c1f5ab5bb5bc455