commit | d560bb1b5fd202ee57e2357d8e6da0cde8723d8c | [log] [tgz] |
---|---|---|
author | Sunny Goyal <sunnygoyal@google.com> | Thu Jul 16 01:18:26 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 16 01:18:26 2015 +0000 |
tree | 73abbd6c48eb48c987887a8e13695835fcc5e38b | |
parent | 5db8c0a5ac3a217e47b4bbd055e00c33deaf0d6a [diff] | |
parent | c606871502e9c6e69c00e3f79d2c2871d7a26dec [diff] |
am c6068715: (-s ours) am 3fec14be: (-s ours) Merge "[DO NOT MERGE] fixing build break" into ub-launcher3-almonte * commit 'c606871502e9c6e69c00e3f79d2c2871d7a26dec': [DO NOT MERGE] fixing build break