tree fae55a88c59c148b2443ee79bbe33d65fa69eec6
parent 806f548e797a1c5d4efc0347dbf707082ceaecc4
parent 29ea54f068f7affce34358b2d8e7eee107269399
author Dan Willemsen <dwillemsen@google.com> 1475703022 +0000
committer android-build-merger <android-build-merger@google.com> 1475703022 +0000

Merge "Convert to Android.bp" am: a4c863fab6
am: 29ea54f068

Change-Id: I6d5e2c1c23684df284727e4194bc5eae02fae025