Nick Kralevich ef36045f96 am 1fdaace1: am 80fdc962: Merge "Error on conflicting <uses-permission>" into jb-mr2-dev ...

* commit '1fdaace1b17ad651d1e5266bb227a26e76b91a50':
  Error on conflicting <uses-permission>

2013-04-04 17:34:31 -07:00

..

android

am 1fdaace1: am 80fdc962: Merge "Error on conflicting <uses-permission>" into jb-mr2-dev

2013-04-04 17:34:31 -07:00

com

am 2987c218: am 728827ff: Merge "Uphold common ordering expectations around action bar Home/Up dispatch" into jb-mr2-dev

2013-04-04 11:10:24 -07:00

jarjar-rules.txt

…

overview.html

…