tree 5197f2e2d4601ad1e4981b46e078fd2548bc7dd5
parent dc8c533e030e6b8625da3dc75c8f768a3242fe16
parent 70be005a18a35ec5fcb46152f0dfbe82156efa3a
author Zhihai Xu <zhihaixu@google.com> 1379113243 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379113243 +0000

Merge "Fixes to the google review comments + spec 1.1" into klp-dev