| commit | 83e5767ee9a8c68150cca06ae0d27a13ba4fcaf8 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed Apr 22 06:59:28 2015 +0000 |
| committer | Christopher Ferris <cferris@google.com> | Wed Apr 22 00:05:52 2015 -0700 |
| tree | 9c72852322473822033addd4f1d902e4b33338d4 | |
| parent | cfef1c84fffb9f781fccb0df4598e0dcdc022182 [diff] |
Revert "Revert "Merge remote-tracking branch 'aosp/upstream-dev' into merge"" This reverts commit 75929a97332565c3b987986f35652b6d5d275d3c. The original failure this was reverted for seems to have been a bug somewhere else. Change-Id: Ib29ba03b1b967f940dc19eceac2aa1d2923be1eb