OSDN Git Service

resolved conflicts for merge of f9a924ab to lmp-mr1-dev
authorJinsuk Kim <jinsukkim@google.com>
Wed, 15 Oct 2014 05:55:57 +0000 (14:55 +0900)
committerJinsuk Kim <jinsukkim@google.com>
Wed, 15 Oct 2014 05:55:57 +0000 (14:55 +0900)
commitf55cdab4bf9f9206d77748d0774065dc8438af0f
treef0c2fdec2626525d4ed329bcbca3696fedec91f3
parent4d526bd249d720ef8dc54b8c7ecef9953e5be5c7
parentf9a924ab81f7ce13e598ff4fbd99c74b9513427f
resolved conflicts for merge of f9a924ab to lmp-mr1-dev

Change-Id: Ic0693b6f2fdb2ea32a280297624b1fe435385deb