Etan Cohen 51a6ca483f reolve merge conflicts of 4e3d827 to nyc-mr1-dev-plus-aosp ...

Change-Id: Idb6cca34536fdbb94876d5cde0b2309462840da1

2016-09-16 12:40:03 -07:00

..

java

reolve merge conflicts of 4e3d827 to nyc-mr1-dev-plus-aosp

2016-09-16 12:40:03 -07:00

jni

Move art::Runtime::InitZygote logic from art into frameworks/base. am: e4f8d69c58 am: c1b32fc3ea

2016-09-16 17:52:50 +00:00

res

Disable network switching toasts on Verizon. am: 8041e897de am: bce7e65b36

2016-09-16 13:15:59 +00:00

tests

Give WakeupMessage the ability to transport an object as well.

2016-09-16 10:22:06 -07:00