OSDN Git Service

Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master
authorBill Yi <byi@google.com>
Wed, 22 Oct 2014 16:00:49 +0000 (09:00 -0700)
committerBill Yi <byi@google.com>
Wed, 22 Oct 2014 16:00:49 +0000 (09:00 -0700)
commit5a71f83227f0340a265f34b226d8fe01d4dd9773
tree9e74435ad8e21fe6ace6a1c49ca2f596c60ced34
parent52656916e35b08013bf776b3603d6cecba287a1e
parenta0d07d49b8b0aae71beb48ec31b43f6923530d00
Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master

Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
cmds/bootanimation/BootAnimation.cpp
libs/androidfw/Android.mk