John Spurlock 30672787d2 am dc28dc63: am 399cac5b: am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs ...

* commit 'dc28dc63a7c04dcb87e257700a1d7aea40de0ce3':
  Fix doc typos in AppOpsManager.java

2014-03-14 17:53:53 +00:00

..

java

am dc28dc63: am 399cac5b: am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs

2014-03-14 17:53:53 +00:00

jni

Merge "camera3: Pass vendor tags through binder."

2014-03-13 20:18:37 +00:00

res

resolved conflicts for merge of 4882ddfa to master

2014-03-13 21:26:48 -07:00

tests

Fixes for download manager test.

2014-03-12 18:22:02 -07:00