tree 15311d152c225db9f96e91df1799ee44c8600ce5
parent c6371b09a4fa4cc06084b74a7f2fbe03f37e44a2
parent 71b60e73c7d4fb431646ccdeb58ba604e05c1a05
author Dan Willemsen <dwillemsen@google.com> 1495072766 +0000
committer android-build-merger <android-build-merger@google.com> 1495072766 +0000

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

Change-Id: Ic4b0b37dc393002f187a25031561594a1999dea4