| commit | 028ae798205af50bf5d98e4276284e22c545385c | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Tue May 26 21:44:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 26 21:44:36 2015 +0000 |
| tree | 7f38d75ea39895339bd4c38b0e987999f4cd333f | |
| parent | 9fa0ad6e5d9922ca562cbf6fdb9c8e7e6c7a823a [diff] | |
| parent | 8451cefee3424ea1d259761dcebaaee26f1ed953 [diff] |
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 '8451cefee3424ea1d259761dcebaaee26f1ed953': DO NOT MERGE: Add cts test to make sure framework shadow is in place.