tree 11fe28b743659f80768c989f025a5d428a2e7060
parent 28ca8f9f95b1ee8186463bfc3f33b9383c0d1dd0
parent 1e3d313c7802673cb5a350fdbbe458398a038fcf
author Romain Guy <romainguy@google.com> 1331251019 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1331251019 -0800

Merge "Fix the docs"