summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-03-11 12:41:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-11 12:41:57 -0700
commit666a30d575e0e279ded82c24b446b7dd4596136e (patch)
tree63f5fd378c80fc9f7c33353cc9b128617229bae8
parent7819abd2d191a170cbc9d4bd190001c465187a9d (diff)
parent63cc80ff010b8bdac107da9cdd1e32b72ca602f7 (diff)
downloadLauncher2-jb-mr1.1-dev.tar.gz
am 63cc80ff: (-s ours) am 1419f206: (-s ours) Reconcile with jb-mr1-release - do not mergejb-mr1.1-dev
* commit '63cc80ff010b8bdac107da9cdd1e32b72ca602f7':
0 files changed, 0 insertions, 0 deletions