OSDN Git Service

am a058f565: (-s ours) am ca36d863: Update API current.xml to unbreak build.
authorNick Pelly <npelly@google.com>
Thu, 13 Jan 2011 01:57:30 +0000 (17:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jan 2011 01:57:30 +0000 (17:57 -0800)
commitbcaab29a1f51d3b5320c385215e51b45e9f7df46
treece50eb6bba60bceaefaef8e9954948100d83362b
parent35b29de5812d65e42289dfd94e17b4a7623fc527
parent902fb854de46898d048e0005baaee92b834cb717
am a058f565: (-s ours) am ca36d863: Update API current.xml to unbreak build.

* commit 'a058f565663253077c3118d9aad00e03dcd45684':
  Update API current.xml to unbreak build.