tree b2eb6c4cb53599e876dcc71dd8ea1f7df65ed454
parent eabab3184a62c5725d0e761146f03e11eaad86db
parent 8240587f7d7e561efbf905ceff8ec929cd6de500
author Jason Sams <jsams@google.com> 1362783033 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362783033 +0000

am 8240587f: am 2042cc40: Merge "Update IP and IP2" into jb-mr2-dev

* commit '8240587f7d7e561efbf905ceff8ec929cd6de500':
  Update IP and IP2