tree 89f90158e36dced43f525d124d0287e1f9b8a94e
parent 98a5fcd895cce64a879982acd17c9ca52e6177ee
parent 4cc5333539f57b54663b0a6e398a11a0aaefc8bb
author Scott Main <smain@google.com> 1317951708 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317951708 -0700

Merge "docs: deprecate thingy"