tree 3cf161fb150a11c51b0f1bf61a7ac49c2d448474
parent c3e3311c050f47a229e1b49f1fdf685669d79d53
parent 36901b6c6029b561b4600916cbacc57d4e933703
author Jeff Sharkey <jsharkey@android.com> 1348107384 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348107384 -0700

Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev