| commit | 2a91db7d583fd36138dd20fe329e29a47513d893 | [log] [tgz] |
|---|---|---|
| author | Bertrand Simonnet <bsimonnet@google.com> | Thu Aug 27 11:51:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:51:37 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 0a5a2cf481036d56a43a5607136453ef1d42b5b3 [diff] | |
| parent | 4f9ec3a62681a9055043d7edf588f7f5d98df2bc [diff] |
am 225660dd: (-s ours) am 1cdf6e94: am d16e9c25: Merge "metrics: Don\'t use the policy file." * commit '225660dd7becaa1c1d67389d22d263342d3d8856':