tree a6b0931b39552679225178b55336de6b92ca31f4
parent b235502492b2dabc862b9293dad9356a0244e56b
parent a2e315be959a55cd8cb6c2ee470efc44dd443a6d
author Scott Main <smain@google.com> 1317951708 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317951708 -0700

Merge "docs: deprecate thingy"