| commit | dfdc6acc4809f395b9db2136acc89b6de932a1a5 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Oct 28 20:42:53 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Tue Oct 28 20:42:53 2014 -0700 |
| tree | c44ec16b92652caec8259db9e472fb6f77a480df | |
| parent | 5d4deb8246b13531a6b2b7611c650ba504e44dc6 [diff] | |
| parent | 3c8cf51f86538e7c580c5574108be825ef00c534 [diff] |
resolved conflicts for merge of 3c8cf51f into stage-aosp-master Change-Id: I507358be6186c4b8d1968cd4e370afe9fd1a02eb