tree 31ce033ea3926bc66a6ae2ad3217878cbffa5238
parent 6d77d98462f6a6409535a321b105d2e631b95cb9
parent 62cb45aec7075e026f4f3fcdc5191ea982b414b7
author Jayant Chowdhary <jchowdhary@google.com> 1486757492 +0000
committer android-build-merger <android-build-merger@google.com> 1486757492 +0000

Enable use by build system. am: d334f9abc7
am: 62cb45aec7

Change-Id: Ia3cc050fb2c0050e26c2b9f8df27cdfe56ff5a03