commit | dcd3cd29d2fdde80d96eb512495619ad883c79d2 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Fri May 22 15:16:30 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 22 15:16:30 2015 +0000 |
tree | 945f44a1a52673ff230d2dbcbaf1a279cb42b38b | |
parent | e5436ae351ba61d23f4a3e298dc1691e472f8bd6 [diff] | |
parent | 8e9233ecabd3ca4a7ae927cb2cdb6e80e8cf01bd [diff] |
am 8e9233ec: Merge "Make mark reflect/accept required, it\'s been upstream for a while." * commit '8e9233ecabd3ca4a7ae927cb2cdb6e80e8cf01bd': Make mark reflect/accept required, it's been upstream for a while.