| commit | d6f314cc4fe778519c86a25e95b670ec59fd6217 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Mon Dec 08 20:28:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 20:28:41 2014 +0000 |
| tree | b285b5f4c014f7b002067984999afef979368d9b | |
| parent | bf401dd7f2771e1d4591da4ece931b6279d80deb [diff] | |
| parent | 898b9e43cfc275acf727b748c191877349a78d98 [diff] |
am 898b9e43: resolve conflicts w/aaf823d2 * commit '898b9e43cfc275acf727b748c191877349a78d98': Fix issue #18368417: 5.0 -> 5.1.