Amith Yamasani 0c25fbde82 resolved conflicts for merge of 5f1c2dbc to master ...

Change-Id: I4d08ad224c8cddd1d379c0f9ec326165a08dd651

2015-06-19 17:04:02 -07:00

..

java

resolved conflicts for merge of 5f1c2dbc to master

2015-06-19 17:04:02 -07:00

jni

Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev

2015-06-19 18:26:42 +00:00

res

am 309c5978: am 05996c10: am 1b48a643: Merge "Revert "Load WebView from one out of a list of packages."" into mnc-dev

2015-06-19 16:26:00 +00:00

tests

am 26c0b5e3: am 1c7f0860: Merge "overlaytests: fix testrunner.py md5sum invocation"

2015-06-19 19:58:46 +00:00