Jeff Sharkey 6495c5ef30 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 ...

am: db901ee296

Change-Id: I683e1c33b8058a597163aacfc744df339188cd37

2016-09-17 00:23:53 +00:00

..

java

Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927

2016-09-17 00:23:53 +00:00

jni

Ensure munmap matches mmap am: aa394dd42c am: 068403a842 am: d073e28853 am: c9cf811b50

2016-09-13 20:47:01 +00:00

res

Disable network switching toasts on Verizon.

2016-09-16 15:45:00 +09:00

tests

SamplingTimer: Fix issue with summary recording too much

2016-08-12 15:49:44 -07:00