Yasuhiro Matsuda ebf9465d21 resolved conflicts for merge of ef57e5e0 to stage-aosp-master ...

Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c

2015-09-02 22:57:53 +09:00

..

java

resolved conflicts for merge of ef57e5e0 to stage-aosp-master

2015-09-02 22:57:53 +09:00

jni

resolved conflicts for merge of ef57e5e0 to stage-aosp-master

2015-09-02 22:57:53 +09:00

res

am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev

2015-08-21 12:40:55 +00:00

tests

am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev

2015-08-07 20:30:38 +00:00