Jose Lima 30df0be254 Merge "Change comment for platform version in master"

2014-03-10 22:23:24 +00:00

..

java

Merge "Allow related users to show activities on primary user"

2014-03-10 21:36:25 +00:00

jni

am 7b7d111b: am 9e736723: am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"

2014-03-10 17:57:35 +00:00

res

Change comment for platform version in master

2014-03-10 10:55:22 -07:00

tests

Merge "Fix state transition verification."

2014-03-08 00:15:53 +00:00