Svet Ganov 9088c083e6 am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev ...

* commit '12b05ec2e7a22fa0cbc1bc55d5a8b6503dbf038c':
  Grant default permissions to the setup app robustly.

2015-07-15 22:46:01 +00:00

..

android

am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev

2015-07-15 22:46:01 +00:00

com

resolved conflicts for merge of 1d4247c4 to mnc-dr-dev

2015-07-15 14:33:10 -07:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…