OSDN Git Service

Merge changes Ie0773f85,Ie5e75505
authorJohn Reck <jreck@google.com>
Fri, 6 Jun 2014 14:41:36 +0000 (14:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 Jun 2014 14:41:37 +0000 (14:41 +0000)
commit743922e9dfe295d4cc837eee1646272aa88da135
tree513d5841a1e07a70171c909d4e2cc54548dc0881
parent53be7b79fb174a4b063753f7c8e5388317224087
parente4267ea4f20740c37c01bfb6aefcf61fddc4566a
Merge changes Ie0773f85,Ie5e75505

* changes:
  Even FASTER damage calculations!
  Have all the setters return changed
core/java/android/view/View.java