tree 9acc2b7a45d9297a86822795193eb57d5455cf90
parent 94c31c85f67ff10a1ea496ce9ea12809174f72c0
parent 2c675f0740695721f04fddffa1abcb6b2b04ffe5
author Scott Main <smain@google.com> 1361918209 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361918209 -0800

am 2c675f07: am 22a73ce3: am 2d0b481f: docs: followup to I32f25b692872ed7827e611890c563498993b2480

* commit '2c675f0740695721f04fddffa1abcb6b2b04ffe5':
  docs: followup to I32f25b692872ed7827e611890c563498993b2480