tree 31ce033ea3926bc66a6ae2ad3217878cbffa5238
parent 6d77d98462f6a6409535a321b105d2e631b95cb9
parent 9392f541322d6e8ebdbfe5e53c1d0784b5802071
author Jayant Chowdhary <jchowdhary@google.com> 1486757641 +0000
committer android-build-merger <android-build-merger@google.com> 1486757641 +0000

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

Change-Id: I6c963d86c2692d2a5825ed3e29650b3be7cccd3c