Dan Willemsen dc3b852125 resolve merge conflicts of 8416096 to nyc-dev-plus-aosp ...

Change-Id: I1638601fe84dda01bf52c59eb6c976bc1fe37498

2016-03-23 15:31:32 -07:00

..

api

…

cmds

…

instrumentation

…

library

resolve merge conflicts of 8416096 to nyc-dev-plus-aosp

2016-03-23 15:31:32 -07:00

Android.mk

…

MODULE_LICENSE_APACHE2

…