tree 49cfd5af481d15b70dbd5e240e5045736d301886
parent 2b05b3f7bb8123233467a9116d4261ee18598db9
parent b0b2982991b62b6272663c74b45c72df14121045
author Dan Willemsen <dwillemsen@google.com> 1495073006 +0000
committer android-build-merger <android-build-merger@google.com> 1495073006 +0000

Merge "Remove reference to obj/lib" am: f599b7285b am: 71b60e73c7
am: b0b2982991

Change-Id: I584d859cadf6f09ded21d0bfab31b00d1f54594c