commit 5bfeeae35118720decd32043b1ecb4537645b527
author Jeff Brown <jeffbrown@google.com> Sun Sep 12 18:16:22 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Sep 12 18:16:22 2010 -0700
tree 8f287eaa42f7a8c2b95c592001550917881124a9
parent 5d8b320428957e377e93abf009b731bb8312bf9b
parent 89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea

am 89b4cb1e: am ff38e38d: Merge "Undo API patch due to field pulled up to superclass." into gingerbread

Merge commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea'

* commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea':
  Undo API patch due to field pulled up to superclass.

api/9.xml

diff --git a/api/9.xml b/api/9.xml
index da0b71b..3e7653c 100644
--- a/api/9.xml
+++ b/api/9.xml
@@ -167549,16 +167549,6 @@
  visibility="public"
 >
 </method>
-<field name="mDeviceId"
- type="int"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="protected"
->
-</field>
 </class>
 <class name="KeyCharacterMap"
  extends="java.lang.Object"