Nick Kralevich 1fdaace1b1 am 80fdc962: Merge "Error on conflicting <uses-permission>" into jb-mr2-dev ...

* commit '80fdc9624e6d53a78031bf99d34e7c01d53ad66e':
  Error on conflicting <uses-permission>

2013-04-04 17:27:44 -07:00

..

java

am 80fdc962: Merge "Error on conflicting <uses-permission>" into jb-mr2-dev

2013-04-04 17:27:44 -07:00

jni

Fix reference cycle in InputEventReceiver and Sender.

2013-04-02 18:59:15 -07:00

res

Merge "Fix for bug #8146846 Phone App should be mirrored for RTL languages" into jb-mr2-dev

2013-04-04 21:16:43 +00:00

tests

Merge "Add direct API to get ManifestDigest" into jb-mr2-dev

2013-04-03 20:27:43 +00:00