summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/View.java
diff options
context:
space:
mode:
authorSascha Prueter <saschap@google.com>2012-12-07 12:42:15 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-07 12:42:15 -0800
commit85ae89dcbaa3aec500d89dd597b5b3befcfad0b3 (patch)
treef67d2adb05ae196a3dd601c0d89391f6ab8df63c /core/java/android/view/View.java
parentcd252d267b09d6838e9c363c87befd4697d45b53 (diff)
parent961ce2afbf82d4b2a9691f1c1cc75a97ce43fe2b (diff)
downloadframeworks_base-85ae89dcbaa3aec500d89dd597b5b3befcfad0b3.zip
frameworks_base-85ae89dcbaa3aec500d89dd597b5b3befcfad0b3.tar.gz
frameworks_base-85ae89dcbaa3aec500d89dd597b5b3befcfad0b3.tar.bz2
am 961ce2af: (-s ours) am 2588648b: am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev
* commit '961ce2afbf82d4b2a9691f1c1cc75a97ce43fe2b': Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
Diffstat (limited to 'core/java/android/view/View.java')
0 files changed, 0 insertions, 0 deletions