tree fc38678ab4ac738cd00cd6582fad864e7d3ae553
parent 67128cbc3371586b6ae0b428621c8d95fb9561f0
parent b3ff35adc5a4b55f90d8fe0e69b7290002ee107d
author Scott Main <smain@google.com> 1362517585 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517585 -0800

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

* commit 'b3ff35adc5a4b55f90d8fe0e69b7290002ee107d':