| commit | c706f68d210dbf612e064be69e61651b84dc3476 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Thu Oct 30 19:15:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 19:15:45 2014 +0000 |
| tree | 46faad32d4caa6d803e621db83313faf69c52274 | |
| parent | ec571682e852bda77151b570653921ad8c3fa5de [diff] | |
| parent | 0d74973a08ebe4b7547100f7d60db07152cbbcd4 [diff] |
am 0d74973a: am befe778c: Treat optimistic addresses as global preferred. automerge: 9a8351d * commit '0d74973a08ebe4b7547100f7d60db07152cbbcd4': Treat optimistic addresses as global preferred.