Dianne Hackborn 326ef35f6f Merge "Add new proc state constants and delivery."

2013-07-13 01:15:30 +00:00

..

java

Merge "Add new proc state constants and delivery."

2013-07-13 01:15:30 +00:00

jni

Merge "Return correct status for android.media.AudioTrack.write(short[]...)"

2013-07-12 20:13:00 +00:00

res

Merge "Permissions to protect socket marking settings"

2013-07-11 22:25:14 +00:00

tests

am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:53:27 -07:00