OSDN Git Service

Merge changes from topic 'mwd-merge-050415' into mnc-dev
authorPrerepa Viswanadham <dham@google.com>
Tue, 5 May 2015 01:05:57 +0000 (01:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 5 May 2015 01:06:38 +0000 (01:06 +0000)
commitd1808401ca3bfd6b6b9a975c1e739b194d18f849
tree50c16a5c966772fd3b3ac4f7d2e79c97252935c7
parent44b60be189183138437a3faf9a73388af0efcf44
parent059ded5a7b7389b7eefc2502bd712228931ed107
Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
api/current.txt
api/system-current.txt
core/java/android/view/View.java
core/java/android/view/ViewGroup.java
core/java/android/widget/AbsListView.java
core/java/android/widget/Editor.java
core/res/res/values/public.xml
services/java/com/android/server/SystemServer.java
tools/aapt2/Android.mk