| commit | 6cdea66a801e52a7cba7b8aa005060bbc223f06e | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Mon Aug 18 22:11:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 18 22:11:05 2014 +0000 |
| tree | 225acea30efc9442421f376a7b29ff144e8a9408 | |
| parent | 7a767eeb8c15f0ed7f9fbae2ee2aaafb91778289 [diff] | |
| parent | cd08a843b2bd8a5bb592939e1ba30fd1e6aa6d89 [diff] |
am cd08a843: (-s ours) am 20f6b4bd: DO NOT MERGE * commit 'cd08a843b2bd8a5bb592939e1ba30fd1e6aa6d89': DO NOT MERGE