Narayan Kamath bab1a3f396 am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev ...

* commit '09f669f02217b7335f0589812ee0761dbbc28e96':
  Revert "Revert "Revert "Update Trusted Credentials screen in settings"""

2014-08-15 12:42:42 +00:00

..

java

am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev

2014-08-15 12:42:42 +00:00

jni

resolved conflicts for merge of 32db2c97 to lmp-dev-plus-aosp

2014-08-15 13:33:03 +01:00

res

am 48734f62: Merge "Tweak leanback form style" into lmp-dev

2014-08-15 02:06:01 +00:00

tests

Switch RouteInfo to use IpPrefix instead of LinkAddress.

2014-08-13 21:17:20 +09:00