Elliott Hughes 368d81fe18 am c67b2ed5: Merge changes I80eaecff,Ia2b4f79b ...

* commit 'c67b2ed50226c4758d0fc1434d39f6add6a0a533':
  Switch Process.myTid over to the libcore JNI too.
  Replace native Process getpid/getuid with calls to libcore equivalents.

2013-07-31 17:57:22 -07:00

..

java

am c67b2ed5: Merge changes I80eaecff,Ia2b4f79b

2013-07-31 17:57:22 -07:00

jni

Switch Process.myTid over to the libcore JNI too.

2013-07-31 17:38:11 -07:00

res

am 8cf1f446: Merge "fix typo: Remove dulplicated comment line"

2013-07-30 11:45:25 -07:00

tests

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

2013-06-28 16:50:13 -07:00