keunyoung e3d2cc8fcc fix build ...

Change-Id: Ife4a1e33df2e4a71edba7b29844a06138103440d

2013-07-12 16:55:44 -07:00

..

java

fix build

2013-07-12 16:55:44 -07: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