OSDN Git Service

resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp
authorDan Albert <danalbert@google.com>
Fri, 19 Sep 2014 22:57:26 +0000 (15:57 -0700)
committerDan Albert <danalbert@google.com>
Fri, 19 Sep 2014 22:57:26 +0000 (15:57 -0700)
commitc04d92cac93fdbbdc6d104f15f6496d197753e92
tree8d8e1b83666562d4f28998c4b1e9b2ee5ac2ec44
parent901c36e51c052c6f0556b6272bbeaaa3aa716fd8
parent1a4527ce9449d913e7a60dc3784520006d8955b7
resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp

Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
core/jni/Android.mk
libs/hwui/Android.mk
tools/aapt/Android.mk