tree a49fce9a6c3029dc6a45125046e1488f96d983e5
parent 2b362f7d8dd037dabe821e282e8a49b63f501802
parent 11c3f85ab75cd21a1975025c6d8614e710161baa
author Jeff Brown <jeffbrown@google.com> 1336499482 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336499482 -0700

Merge "Move CancellationSignal to android.os package." into jb-dev