Robert Greenwalt 2a7fee4e33 Merge commit '695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c ...

Change-Id: I768181b347ac5676f3535d94a26ca9e81178a110

2017-04-19 14:03:30 -07:00

..

java

Merge commit '695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c

2017-04-19 14:03:30 -07:00

jni

Merge "Binder: Log details of pending exception." into oc-dev am: dc51eedd1f

2017-04-19 08:11:01 +00:00

proto/android

…

res

Merge "Creating a common class for loading drawables and handling various badging" into oc-dev am: 15b48ff4de

2017-04-19 03:03:37 +00:00

tests

Merge "guard against nulls in LogMaker" into oc-dev am: ddf1d16504

2017-04-18 23:49:54 +00:00