Igor Murashkin ed5d7a6f14 am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" ...

* commit '4463a4ef26b2eb62fae74568193fd07e97dedd4d':
  EGL14.eglCreateWindowSurface should set producerControlledByApp

2014-01-31 16:29:06 +00:00

..

java

resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp

2014-01-31 12:57:24 +00:00

jni

am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"

2014-01-31 16:29:06 +00:00

res

Make MANAGE_ACTIVITY_STACKS a signature|system permission.

2014-01-26 21:58:51 -08:00

tests

XmlUtils#readThisMapXml should handle null keys.

2014-01-06 11:18:21 +00:00