OSDN Git Service

am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE
authorRobert Greenwalt <rgreenwalt@google.com>
Tue, 7 Jun 2011 20:12:29 +0000 (13:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jun 2011 20:12:29 +0000 (13:12 -0700)
commite139167c9109aee203f5fbbdeeab656994d9c9ac
treeeffd4f9d77b8b3b1d44abb1a37d2b9351976727f
parenta7d01a75190abbb4b3f47d15c86421bd19c11fc2
parent5df69fad6e5021d2862bff0553a510f8d6729fbd
am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE

* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
  Reveal some network constants.
api/current.xml