tree 1d08f862c17d7dbddbcc941fbb73c269801e49a7
parent 75f8ae84ecb8f713b56e35863eada16c6d6606a2
parent 0f5621ae4b3eacbdd9000acffba3881d03a4df23
author Jayant Chowdhary <jchowdhary@google.com> 1486441765 +0000
committer android-build-merger <android-build-merger@google.com> 1486441765 +0000

Modifications enable use by the build system. am: 88d0f99dee am: fcd3e09426
am: 0f5621ae4b

Change-Id: I30078be3c56bf26b4b082aaca6380f41e3ce4d2d