| commit | 34d4204627d71009e8ffba2f492ca7fec2231dec | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Tue May 26 21:58:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 26 21:58:37 2015 +0000 |
| tree | e1b70e3172600a32b57fe04c56877e92a9da52b1 | |
| parent | 0d004e947db37f2b3a02e385c24fcd15dc0ee8fb [diff] | |
| parent | 028ae798205af50bf5d98e4276284e22c545385c [diff] |
am 028ae798: (-s ours) am 8451cefe: am 5c08e062: (-s ours) am 9252eb86: am 7d2e1f5d: am 939f4800: (-s ours) Merge "DO NOT MERGE: Add cts test to make sure framework shadow is in place." into lollipop-mr1-cts-dev * commit '028ae798205af50bf5d98e4276284e22c545385c': DO NOT MERGE: Add cts test to make sure framework shadow is in place.