| commit | 0c26c324030d4ee2998212aff57ce65c3c303860 | [log] [tgz] |
|---|---|---|
| author | Wang Xiaolei <wxiaolei@google.com> | Fri Jun 03 20:01:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 03 20:01:37 2016 +0000 |
| tree | fd8de8523cbc799d149e24f2c0144ae11d15dcfb | |
| parent | 2f09a29ad7c83e94ca357e28ce75ceb4b3d6b183 [diff] | |
| parent | f5b0bf356350b53d02d6dfea96defd087f8c2f2a [diff] |
Merge commit \'44b24c9b38d87dfd8bee2aca381f18a9106313dc\' into manual_merge_44b24c9 am: f5b0bf3563 * commit 'f5b0bf356350b53d02d6dfea96defd087f8c2f2a': Revert "Revert "Finalize resource IDs for N."" Change-Id: I7b86da45e999d538641dcc4221c25eb148adf495