tree 5a21823c0312082613eee65a92cf99b2e7e8da30
parent f3b63ed11a5a7e9b19bcfe8b42f9cd9c029e6a14
parent 2df5d04ea5e56e4f8de88359a07bb2beabd5445a
author Scott Main <smain@google.com> 1362517774 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517774 -0800

am 2df5d04e: am b3ff35ad: am 06706ba5: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480

* commit '2df5d04ea5e56e4f8de88359a07bb2beabd5445a':