tree 57282cbdf64c0f3eeb54c5371fc08d3756e27da0
parent 1a9c6c97fa9f156d16190e519ae4faa13371fa72
parent e16c279d4f39231b25948cdd19a642ca676d82c7
author John Huang <jsh@google.com> 1315764809 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315764809 -0700

Merge "Handle HSPAP."