Adrian Roos e901a1540d am ae9b5cd0: Merge "Pass initiatedByUser to TrustListeners" into lmp-dev ...

* commit 'ae9b5cd05215910b69624d028b4288eb50972175':
  Pass initiatedByUser to TrustListeners

2014-08-07 14:00:20 +00:00

..

java

Revert "Update Trusted Credentials screen in settings"

2014-08-07 13:41:08 +00:00

jni

Move image classes options from art to AndroidRuntime [frameworks/base]

2014-08-06 22:25:01 -07:00

res

am 37f56e55: Update branding colors

2014-08-07 01:29:28 +00:00

tests

Revert "Revert "Service data and manufacturer data can be repeated fields.""

2014-08-01 11:12:37 -07:00