| commit | afe37210f69714048f5b8f95cf631ba40e918e28 | [log] [tgz] |
|---|---|---|
| author | Bertrand Simonnet <bsimonnet@google.com> | Thu Aug 27 14:33:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:33:21 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 9bd515f9b8067bf116911be94ca203946e33331d [diff] | |
| parent | 2a91db7d583fd36138dd20fe329e29a47513d893 [diff] |
am 17238c24: am 225660dd: (-s ours) am 1cdf6e94: am d16e9c25: Merge "metrics: Don\'t use the policy file." * commit '17238c24b501521cb6bb59eb27465caa4fd04db7':