tree 392967646058de8eb9c24d5c80c02b71ab9512d1
parent 50bad313e4bf310568f70195c3a751d79bddc16c
parent e139434e3ab235fde6a5d17b9128e5665db32115
author Josh Gao <jmgao@google.com> 1497933007 +0000
committer android-build-merger <android-build-merger@google.com> 1497933007 +0000

Merge "Hack around b/36066697." into oc-dev
am: e139434e3a

Change-Id: I422d2b73fc854047d1293919c25f0656df0842c9