commit | 38a3ddf44a42c07a0ec629537225c9ddd1fd47af | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Fri Mar 14 00:22:56 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 00:22:56 2014 +0000 |
tree | 4bf123f5deaf0a702347ef63b0f398bcaa4c521b | |
parent | 2e8436b462f405d195f2370d65e10efe48c7e18f [diff] | |
parent | c59474d2813be8df40090ca121f9570977796aa7 [diff] |
am c59474d2: (-s ours) am ba3d0fd5: am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev * commit 'c59474d2813be8df40090ca121f9570977796aa7': DO NOT MERGE Ensure transient state views are temporarily detached