tree 4d546706cf12731ef2ba1bc5c0b42e0d9be1cfdb
parent 3d6b009db124615a09e2c6dcf25bf8352f6aaca9
parent d4e722b74f4a5c58db03dd94d79f192c0a9b3004
author Robert Greenwalt <rgreenwalt@google.com> 1284143394 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284143394 -0700

am d4e722b7: am 34763928: Merge "add ART for inet connection condition" into gingerbread

Merge commit 'd4e722b74f4a5c58db03dd94d79f192c0a9b3004'

* commit 'd4e722b74f4a5c58db03dd94d79f192c0a9b3004':
  add ART for inet connection condition