| commit | 0ee642b1b2c8a282759e53dc1cad4fa7564a8874 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Wed Oct 02 00:12:36 2013 -0700 |
| committer | Andrew Hsieh <andrewhsieh@google.com> | Wed Oct 02 00:12:36 2013 -0700 |
| tree | 18b5ac31c1d0c7740467e0efdcac525829b3fef7 | |
| parent | 781bff8c80842cbfb52b4ba50a1de64b1139da93 [diff] |
Fix auto-merge conflict in wrong order All aosp and recent internal branches should have the same prebuilts/ndk Sync with current aosp Change-Id: I02cf56a583611c276a9eebbb5d06ba026bdc8eb7