tree eea11e689da2bc5f9a18567f349e8261327e8347
parent 7d6070c3fd486af99f44c0fa3d4e8a7bc484ed95
parent 0e80be1a8de04f47abf1e614ec8b69db20908642
author Robert Greenwalt <rgreenwalt@google.com> 1285043489 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285043489 -0700

am 313af5a3: Merge "Add Inet Condition log to bugreports" into gingerbread

Merge commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a' into gingerbread-plus-aosp

* commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a':
  Add Inet Condition log to bugreports