John Reck c01a9b6a9b Merge "Fix some edge cases" into nyc-dev ...

am: 4a62eff

* commit '4a62effbfe8ad9a0eb7049c2f52a57d39bb64e29':
  Fix some edge cases

Change-Id: I35a99c3164bf3bf91f609ce8bec01d15ca8b7c0d

2016-04-07 23:12:14 +00:00

..

java

Merge "Fix some edge cases" into nyc-dev

2016-04-07 23:12:14 +00:00

jni

Merge "Fix some edge cases" into nyc-dev

2016-04-07 23:12:14 +00:00

res

Merge "Add VrManager AIDL interface for use by system apps." into nyc-dev

2016-04-06 21:42:17 +00:00

tests

Merge "Remove tests that have been moved to CTS" into nyc-dev

2016-04-07 17:08:33 +00:00