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