| commit | ecdc32ede696ed3f460adadbd441d974196f6215 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Thu Apr 17 20:58:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 17 20:58:05 2014 +0000 |
| tree | d9aa88d18409ab9a828e3448115b8fd793a474d7 | |
| parent | 5f8cfadf48028364b6f0269a2158e43b7a02303a [diff] | |
| parent | 66af75d12ed1542f66c60e7cac7726fea98684ed [diff] |
am 66af75d1: am a04110f7: (-s ours) am 34b3a261: am e7841bf4: am 3e3b4dfe: am b1aa73f6: am eb02f412: Merge "Use unique entries only. Do not merge." into jb-dev * commit '66af75d12ed1542f66c60e7cac7726fea98684ed': Use unique entries only. Do not merge.