OSDN Git Service

resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0d...
authorDavid Christie <dnchrist@google.com>
Wed, 24 Aug 2016 22:14:28 +0000 (22:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 22:14:28 +0000 (22:14 +0000)
am: af369f6e66

Change-Id: I6973f8f1053644548062b94c1696c123f47f0ad4

1  2 
core/java/android/os/Process.java

Simple merge