Tao Wu f338ed34f9 Merge "Remove unused variable." ...

am: f3b1881bb2

Change-Id: I563647e4f5abc635ff3f67d7f0b658bdd1d92716

2017-01-10 21:29:16 +00:00

..

java

Merge "Remove unused variable."

2017-01-10 21:29:16 +00:00

jni

Merge "HwBinder: get/register checked exceptions."

2017-01-06 01:05:02 +00:00

res

Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a

2017-01-09 14:33:59 -08:00

tests

Merge "Cherrypick: Create ScoredNetwork Badging API changes."

2017-01-09 23:51:07 +00:00