Elliott Hughes b8292830f7 resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp ...

Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6

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

..

java

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

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

jni

am 11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."

2013-06-17 18:21:41 -07:00

res

am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev

2013-06-27 14:52:37 -07:00

tests

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

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