OSDN Git Service

am 83892ecb: Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus...
authorAndreas Gampe <agampe@google.com>
Fri, 7 Nov 2014 23:17:40 +0000 (23:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Nov 2014 23:17:40 +0000 (23:17 +0000)
* commit '83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55':
  Frameworks/base: Wall Werror in libs/androidfw

1  2 
libs/androidfw/ResourceTypes.cpp

Simple merge