tree 03d901cb104caa59e07093f5238d493e35a597b3
parent fde01a395d99f6f2441c9fff27ea06f45e299d57
parent e186f6215cc8d01909108172eaa2a27f0a452130
author Chris Banes <chrisbanes@google.com> 1462380719 +0000
committer android-build-merger <android-build-merger@google.com> 1462380719 +0000

Re-add hidden API am: adfb679ade am: aa5133d08e
am: e186f6215c

* commit 'e186f6215cc8d01909108172eaa2a27f0a452130':

Change-Id: Id008abb2c6bf9e036a45f0633fa0c6c10a421f74