OSDN Git Service

resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp
authorNick Pelly <npelly@google.com>
Mon, 14 Mar 2011 17:28:11 +0000 (10:28 -0700)
committerNick Pelly <npelly@google.com>
Mon, 14 Mar 2011 17:28:11 +0000 (10:28 -0700)
commita64e2ad4da3612586594a19489a2b5d44f3f23a0
tree1c682135210ff543b511152425bc0406b754780d
parent2d24213fca55fece8ce4a69a53abcd45983b0443
parent38d0d5628d36bb1c2a8353a2b3e1a041e9e84652
resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp

Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
Android.mk
CleanSpec.mk
core/res/AndroidManifest.xml