OSDN Git Service

resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Sat, 23 Jun 2012 14:08:59 +0000 (07:08 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 23 Jun 2012 14:08:59 +0000 (07:08 -0700)
commitc34188a95405526416325604386af4f48ba20918
treebb7f0e1b93a01142b6ec59f9572f5ccb8d11d3b7
parent0e61a7268460392b706904c032cb6ae7f931692f
parentf8f76d52a7f7cf9ceb57670b5cf62052ddc8662d
resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp

Change-Id: I83beeb45320de2c3fc3a00c2f5cd86a17ac1dc9f
api/current.txt
core/java/android/view/FocusFinder.java
core/java/android/view/View.java