Chirag Shah 3db44d08ea am f40f46e9: am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev ...

* commit 'f40f46e94c773676158b3f7e9cd51157cc9a91d2':
  Allow 3P apps to provide structured data within AssistContent.

2015-06-16 21:24:48 +00:00

..

java

am f40f46e9: am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev

2015-06-16 21:24:48 +00:00

jni

am b17c58dd: am 26a40606: Merge "jni: isLoggable calls __android_log_is_loggable"

2015-06-16 14:35:25 +00:00

res

am ece811da: Merge "Add ic_dialog_alert_material to symbols" into mnc-dev

2015-06-16 20:07:05 +00:00

tests

Add a test that Network#getNetworkHandle() behaves sanely.

2015-06-15 15:18:38 +09:00