Jean-Baptiste Queru 6cd4281dae am 65ba6d11: am 1e7276ce: Merge "Fix typo in AlertController.java" ...

* commit '65ba6d11e1f3ecf33a5b6e68ab8a6322e993b4d8':
  Fix typo in AlertController.java

2013-07-08 14:42:56 -07:00

..

java

am 65ba6d11: am 1e7276ce: Merge "Fix typo in AlertController.java"

2013-07-08 14:42:56 -07:00

jni

Mixed delete/delete[].

2013-07-03 19:26:23 -04:00

res

am 505565c3: Import translations. DO NOT MERGE

2013-07-03 11:35:02 -07:00

tests

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

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