tree 60efd81fc119b8b7d255d9090d21c9e96282a403
parent 405265683fd5a524dec2131b2c69da5d48d10650
parent 1e5926fa42d850855212111b9cc28cf18f3f96c5
author Dan Willemsen <dwillemsen@google.com> 1475022341 +0000
committer android-build-merger <android-build-merger@google.com> 1475022341 +0000

Merge "Convert to Android.bp" am: e6b6ae65df am: f2895a0b3e
am: 1e5926fa42

Change-Id: I6d497d52772d6ed16afc7ac0c6e9735cd9e5b313