Andreas Gampe 1c0668a3f8 am 83892ecb: Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
* commit '83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55':
  Frameworks/base: Wall Werror in libs/androidfw
2014-11-07 23:17:40 +00:00
..