Dianne Hackborn 6f467d3e43 am 898be168: Merge "Add support for muliple active development codenames." ...

* commit '898be168bda75b204611e8e24439d33213ecab5f':
  Add support for muliple active development codenames.

2014-04-25 16:08:31 +00:00

..

java

am 898be168: Merge "Add support for muliple active development codenames."

2014-04-25 16:08:31 +00:00

jni

am fc02fcc8: am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues"

2014-04-24 22:19:51 +00:00

res

am 46ca5060: Merge "Nested scrolling!"

2014-04-24 18:27:37 +00:00

tests

Allow prefix-based Uri permission grants.

2014-04-22 21:06:49 -07:00